Reorganising bits and bobs a little bit.