cleanup, doc slightly more