Removed deconstructor prototype
Added body to trivial methods