Refactored view part