Minor DRY