rearrange the math formula layout, fix typo