A bit of code cleanup
Minor documentation improvements