Cleanups, docs