optimize imports + reformat code