Refactored View