some style cleanups to break up some long multi cmd one-lines

This was done to minimize LOC, but it's not worth the sacrifice in
readability.