Incorporate review comments