some corrections of code formating