Made a few changes and had a tidy up