minimal briefcase client code refactor