make code more go-stylish, phase#3 ('comma ok' idiom)
make code more go-stylish, phase#4 (function comments for godoc)