Noted. Having some issues with `goimports` playing nice in vim so just manually ran them through.