CLN: Cleanup whitespace, documentation, minor test fix.