Cleanups, doc