Reformat code & optimize imports