reformat code, optimize imports