Cleaned up some formatting of code