Changes from review; Took out superfluous code;