A bit of shuffling and restructuring.