Wee refactorings