Additional refactorings