replacing hepler classes with clients