Cleaning up the creator
Cleaning up creator