small refacorings for a single file for jacoco ...