adapter tidy up