More DRY improvements
More DRY improvements
DRYer