Fixed imports, gofmt