Fix typo in class name
Add diamond operator when possible
Fix imports