Coding Standard:  Minor cleanups
Coding Standard:  More cleanups