clean up to coding standards