clean stuff up, get rid of unnecessary cruft
simpler shorter names