Refactoring
Merge pull request #1 from LepageT/Refactoring

Refactoring