Additional wave of refactoring