Further_Refactoring