cleaned up the client. going through routing