REFACTORING COMPLETE