Making the CLI a parameter to be passed to the invocation

Allows choice between multiple CLIs and removes the need for access to the repository. Also some minor formatting cleanup.