More clean up: comments, imports, whitespace