Using struct literal notation
Some formatting and commenting changes

Man, Golint is picky!