refactored views