Refactoring sprint#1 refactoring finished