Cleaned up some of the formatting