Fix style
Enhance coverage