Minor code cleanup and adjustment to linter settings.