linting, refactoring
linting