cleaned up client/{lib,helpers}