More clean up and renaming