Refactoring underway