re #25 clean code
Merge pull request #48 from jean553/fix_25

re #25 clean code