Minor cleanups, renames