Minor changes as haoyuan mentioned