Pillar supplied refactoring exercise