More linting and some code simplifications.