Cleaning up some code formatting