Docstrings, pre/post-conds, cleanup