Refactored views