It would be nice to run all files through `gofmt -s` to simplify the code as well as catch any formatting issues that have slipped by.