Full refactoring initiated