Cleaning up code format