more shortenings and simplifications