Fix
Fix use statements and comments
Improved comments
Fixed composer.json