Performed the fifth code refactoring