refactoring xit-0.9.0