Improve the style

Improve the style