Added some review comments