solve review comments