DRY violation fixed