misc code cleanup and more feature naming
Authored by: rbri 2013-08-25
Parent: [r8451]
Child: [r8453]