Incorporate some of the feedback from PR #511.
Incorporate some of the feedback from PR #511.

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