Linting and scaffolding clean up.