Refactor Kumagame 10-25