reformat code & optimize imports