Bug 522137: Improve code quality

  cleanup

Change-Id: I6b896c19a2e692218ee190257273138840911247
5 files changed