Refactoring
Merge pull request #34 from CruGlobal/SP-351

Refactor