Refactor: cleanup, rename, more mods