DRY up the cruft