Improving Client2.java