Rearranged the math header a bit