New refactoring completed