Refactoring
Merge pull request #9 from Wikidata-lib/refactor

Refactoring