Clean up Server.java a bit