DRYing where possible
Merge branch 'beta'