Minor commandline refactoring