Running gofmt and adjusting ignores.
Potential fixes for the CPU issues we see on some relays. Simplified things a good deal as well.