code style, doc. comment clean-ups