Clean up and renaming