doc comments and style tweaks