Just some tidy up