Adjusting formatting.

All commas are now followed by spaces. This improves readability. A
section of code where multiple commands were on the same time has been
split to separate lines.