Cleanups and method renames