Use type
Improve code style