Code beautification
Continuing cleanup and beautification.