Reformat code and Optimize imports