Fix DRY violation