Random tidying up before I attempt some really big stuff...