Refactoring In Progress