am 4de145bb: Minor code cleanup

* commit '4de145bb568b6963d374fa0bac199218dc494186':
  Minor code cleanup