Do not double free when using destroy method

Just a quick fix in Destroy method, as if it is used , the destructor causes a double free on object deletion.

The rest is only whitespace changes, which I think I messed up im my previous commit :)