Refers #32, #33 -- Further docstring cleanup