Merge pull request #7 from mynomoto/more-refactoring

More refactoring