Just tidied up

No major changes