Code cleanup in Client.java.