refactoring after pull request