Cleaning the code a bit
Fixed Deconstuctor