Minor cleanup

typos and minor code polishing
go vet