Further refactorings