am 97a3ce02: Merge "Refactor"

* commit '97a3ce022c4f158712fb803f7acd0151719b336e':
  Refactor