Code Refactor

Code Refactor