Problem 5 : Refactorying