am 94800f46: Merge "Address some comments and clean up"

* commit '94800f46da0aded5152545322ad842f89e8a21d8':
  Address some comments and clean up