PMD fixes - left behind lots of law of demeter and declaring things final