initial conversion cleanup and reformat, no
Authored by: rmottola 2014-12-03
Parent: [r422]
Child: [r424]