fixed DRY violation