More cleanup & renaming