Code refactoring
Refactor