Refactoring 05 eliminate redundancy of this