Tweaked command line and code cleanup