Commandline options refactor