Refactoring, Jvm client done