Refactoring suggestions for Dec24th, light code cleanup.
Merge pull request #2 from sdtsui/master

Refactoring suggestions for Dec24th, light code cleanup.