Fixed typos and incomplete refactoring
Merge pull request #6 from nfrp/master

Fixed typos and incomplete refactoring