code cleanup for style guide