In the middle of refactoring