Reorder the var sections to be more readable.
Vars without initialization come first on one line, then each initialized var is a separate line.