* Removed some duplication between view and model