Remove unused variable and some cleaning
Merge pull request #145 from LucileIPP/master

Remove unused variable and some cleaning