whitespace & comment cleanup