Optimize imports
Code improvements
Less compilation warnings