Optimize imports
Reformat code