Reformat code + optimize imports