Removed spaces and comments