Style fixes
Improving coverage
Improving coverage