removed trailing space and comments