Code formatting cleanup + argparse as dependence

Change-Id: I04c3f684868e8ab1d2254635e8f8dfeeaa6a7adc