296cc41b03
* Naming/style changes * Taking advantage of switch statements * Removing unneeded NULL checks * etc
* Naming/style changes * Taking advantage of switch statements * Removing unneeded NULL checks * etc