more comments & linting