Code Refactor
Code refactor