Fixed DRY violation