Optimized imports and fixed some pmd