code Refactoring