Optimized imports and code reformated