In the process of refactoring