tree 7969cfe31efdde630ffb3421690c6c723b41a56a
parent c11673bf5fcd2823b98e66aaf75cd3cf7f0eacb4
author John Newlin <jnewlin@google.com> 1455136477 -0800
committer John Newlin <jnewlin@google.com> 1455137753 -0800

Code simplication and cleanup.

Simplify some code and cleanup compiler warnings.

Change-Id: Ib6734421d569d281056553b76efaf0a0d17cf137