reformat code, organize usings