Re-formatting code with gofmt

The following command was used:

    gofmt -w -tabs=false -tabwidth=4 [file]