refactor matome