fixed spaces and comments