linting/refactoring