rearranged formatting