optimization of imports and reformated code