DRY refactorings