Cleaning and fix review comments.