implement review comments.