some cleanup and linting