Update 3/17/14

Code clean