Finish Refactor phase in Exersice 3.5