Add destructor and comments