- Moved Environment clear() method to its destructor and other improvements