DRY

24