cleaning up code conventions