Implement some review remarks.