Renamed file, added destructor