Updated CLI to actually work with the latest version of things
Ran go fmt on package