* Code Refactoring