refactor for Lint