A little bit more code cleanup/linting.