Clean up
Add creation of instances