some coode coverage cleanup for review