Code Refactoring.T-T