DESCRIPTION

More refactoring and small redundant fixes.

Change-Id: Idb7309142246d450f68c278732202085ed4510cd


COMMENTS

