removed useless comments, whitespace