Cleanups and renames