Tidied up
Major tidy up and rationalisation