Coverage
Minor code cleanup