Refactoring ! all code reset !