ENH re #8 fix #8 clean up code and corrected format on docs