More cleanup
Optimize imports
Fix formatting