Tidy up and a few changes

:)