cleaning up coding standards