10-13-14 cleaned code up