Better disposal of objects
Removed debug print statement