Clean up of code to make it easier to read
Authored by: dmarney 2010-08-02
Parent: [r327]
Child: [r329]