Refactored views to improve readability