Style cleanup / structure reordering

[Graham Leggett]

Hi all,

With the imminent arrival of v2.4, is it worth going on a style  
cleanup of the codebase and fix any glaring differences?

If we did want to do so, now would be the time.

Regards,
Graham
--