Some refactoring.
Merge pull request #9 from irvinzz/master

Some refactoring.