Coverage indicated refactors, additions