Separate out command line switches

For easier future adjustment/augmentation by different contributors