refactor
Merge pull request #2 from ntrvic/refactor

refactor