cleanup handling of params in scala client