Develop - Code refactoring