tons of linting, import clean up, etc