Correct parse command line, refactoring.