Fix object creation
Cleanup