Simplify and clean up docs and comments.