linting clean-up