DRY some details