Be more DRY