A bit of rearranging