DRY up more