New formatting that removed trailing space for comments;