Tidy up word problems 2