Make it more DRY