Continued refactor of main for minimalism

...dropping more LOC, and reducing the amount of visual jumping-around
a user would have to do to follow what is happening in the main method.