more cleanup
gofmt and update README