Reviewed some comment