Simple refactoring to make code more appealing.
Refactoring and removed useless empty  destructors