modify and cleanup market data controller, views