refactoring & lint