refactoring/lint