Refactoring libmarpa: t+
Refactoring libmarpa: t+