CDAP-489: code improvements