Merge pull request #1 from alexcodreanu86/refactor

Refactor