Refactored view context references