Add destroy, small refactor