Implement One Final Refactoring Change