more code clean up
go fmt