More linting done.