Fix after code review
Fix composer.json