Cleaning up some spacing and formatting