Removed whitespace + unneeded comments