* Cleaning code again

- changed some french var to english var
* fix bug