Updated market data. Tightened up code