reformat and few fixes