Done some tidy up