Rearrange to right spot (I blame github editor ;p)