Cleaned up formatting, comments
Changed and fixed formatting.