cleanup w/ gofmt

I let this get a little nasty.  Cleaned up.