Resolved review comments