clean up to meet style guide