A few more refactorings