DRY refactors