[CDAP-505] Addressed code review comments