Small cleanup
Coverage tweaked