Style tweaks

Some code simplification

Change-Id: I0c5fdd4cffc65ff7abb7e4e42e45e609a2bdac56