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

* commit '5970565b1fafc1b152680b4904ad5be0af4b355e':
  Address some comments and clean up