linting and clean up