composer update and remove code commented
fix use resolving
remove todo reminder
fix prototype function
code cleaning