Cleaned up DemandView class