Some refactoring to hide stichwort library in API