Continuation of refactoring