Lesser refactorings