remove useless comments, whitespace fixes