minor changes
refactoring
Merge pull request #28 from Tokanagrammar/refactor

Refactor