am 9dc41d5d: Merge "Refactor the code."

* commit '9dc41d5d34c792e7a05e1ddfeea99c6cfc02fffd':
  Refactor the code.