Made it more DRY