Address first set of review comments
Address second set of review comments