More minor tweaks to the Dockerfile and associated scripts

Lots of whitespace changes, a little minor reorganization.