Rearrange some logging statments to reduce log spam
And go fmt