Tidied client a little