main.go - cleanup

Just moving around the command declaration into a struct-type which
is hopefully a little cleaner (hopefully).