-Refactoring of all the code