clean up/linting