Vinay | 5 minute lint exercise
More cleanup
Reduce coverage