CommandLine now passed in CommandArgs
Reformatted all code, enforcing code format style from now on