Incorporate more review comments