Optimize imports and format code
Additional resolver