cleanup, comments & whitespace