Coverage and more cleanup. For #46 Closes #48