incorporated gilad's review comments into ch02

Review URL: https://chromiumcodereview.appspot.com/107083005