Renames, docs, cleanup