* some cleanup
* reduce jacoco value (a few covered lines has been removed which reduced the percent but there is no more uncovered code)