tidy up client a bit more