Formatting cleanup

* Attempting to follow Yorba's coding conventions
    (http://redmine.yorba.org/projects/yorba/wiki/CodingConventions)