coding standards clean up