Fix format and removed unused imports