Refactoring: Pull Up Duplicate Code