Changes according to Brad's comments

Change-Id: I5d4ac1465ca771566f463e90af739b8afffed8aa