add missing return, fix some typos
go fmt