Tweaks and gofmt