mo cleanup
Cleanup, doc comments