Change logging
Add @Nonnull
Fix PMD & Findbugs warnings
Remove prefix