refactor client jdo/gae