Refactoring & Week report 2