Final Refactoring
Merge pull request #13 from TaviscaSolutions/refactoring

Final Refactoring