a bit tidy up