Optimized imports and reformatted code project-wide