Just done a load of cleaning up