refactoring
Big factoring and delete zone on click