Refactor

Correct whitespace, unnecessary commas, and order of option arrays