General code cleanup per linter