Continue the refactoring