Code and imports optimizatio