am 98c271d5: Merge "Code cleanup."

* commit '98c271d517bc4d25fc6879b4b8e35ea93885d9e2':
  Code cleanup.