[#1029] Some formatting/code cleanup.
Authored by: Paul Sokolovsky 2010-11-16
Parent(s): [5aa5bc]
Child(ren): [287c65]