Third step in Refactoring