Fewer erroneous checkstyle errors
Fixed checkstyle