Tidied up and removed some of the clutter