reformat code; fix spacing