Refactoring
Merge pull request #14 from Jylia/refactoring

Refactoring