fixed around comment and newline