Migrate to Pyone and refactor

No match.