cleaned up some un-idiomatic exressions