Code refactoring
Code refactoring