reformat code to meet conventions