Code refactorting
Code refactoring