Refactoring
Refactoring
Issue #11