A little code cleanup and adjustment to linting settings.