Even more refactorings