Fixed based on first code review comments

Change-Id: Ib90a691dc41d9d8f5d7e27075cb6c597648d8384