Updated changes suggested by reviewers.
Updated changes suggested by reviewers.

henn/hil,henn/hil_sahil,meng-sun/hil,meng-sun/hil,henn/hil,SahilTikale/haas,kylehogan/hil,kylehogan/hil,henn/hil_sahil,henn/haas,CCI-MOC/haas,kylehogan/haas