More cleanup, renaming