Commets added + Whitespace fix