doc comment and style tweaks