Incorporate some review comments