DRY-er solution