linting & comment cleanup