cleaned up, worked on regularization
Authored by: gunfloe 2015-07-04
Parent: [r33777]
Child: [r33779]