Address cide review comments.