CODE REFACTORING