Minor beautifucation of cmd.go