Refactoring sprint#1 part2