cleanup and linting