Fix style and  missprints