cosmetic changes: gofmt formatting, etc