Some more clean up and renaming