Add destroy method
Refactor code