further tidy up