fix CR, LF comments, fix formatting