Light refactoring
Merge pull request #6 from jimgong92/master

Light refactoring