Cleaned up and made spacing consistent