refactoring
refactoring
Merge pull request #1 from trayo/refactoring

Refactoring