refactoring part2