Documentation, renaming, housekeeping