Rearranged some lines