Style cleanups

underscore -> camel
dataset is one word, and so doesn't get a capitalized S
fixed the unions without spaces to match the others