Cleanup and minor coding standard error