moved some formulas to equation envs