Lots of rationalisation, tidying, scel & sc working