Doc whitespace tweaks and consistent variable naming.