ENG-6193: Addressing Anish's comments.

A bunch of cosmetic changes including method renaming, removing commented dead
code, etc.