[MOD] Organize imports in project
[MOD] Code cleaning