Incorporate internal review comments