First Refactoring Approach