Style cleanups

underscore > camel
dataset is one word, and so gets a lowercase S
added spaces to the unions without them so that they all match