Added unit tests and re-factored code, Created CommandLineFormat and moved format methods of parser to this class