Checkstyle and other cosmetics
Tidy up in the coverage
Checkstyle mostly