source code: more style and comment fixes