refactoring: Lint cleanups