refactor type
Merge pull request #483 from xi/feature-refactor-type

refactor type