Refactored View part