Formatting changes, adhere to gofmt