integcli: lint fixes

This PR makes a few changes to the integration-cli to clean up some problems reported by `golint`.
good find :)