Optimize imports with PHPStorm
Fix some error reported by PHPStorm