* refactoring : variable names changed
* dead code erased