Even more linting and cleaning.