cleanups and renames