Tidying up

Rearranged things a little bit.