Renaming and cleanup
Cleanup