Some tidy up