fixed formatting & rearranged data