DRY up a bit