Cleanup, comments, doc.