Remove define pr_fmt which is not needed
Fix review problems