Fine-tune the --help stuff
Fine-tune and refactor even a little more