Minor refactor of ClientListener