Cleaning up code formatting