removed spaces and comments