Refactored view