Clean up coverage and code quality issues