Destructor added
Refactored