conforming to style, and fixing documentation