Bunch of refactoring to EChequeServer.java