* Refactoring of code