Cleaning up coding styles