Couple of minor bits of code simplfication

Change-Id: Ibb7f4da745997e1a9899ea306edb9721ee0a575a
Merge "Couple of minor bits of code simplfication"