More DRYing up
Merge branch 'DRYing-up'