Refactor
Refactor some types