Cleaned up some spacing and alignment