Added support for cli args
Formatting