more calculation simplifications