Tidied up client