Improvement
improve readibility
update composer and improve entity
Improvement for learning purpose