all findbugs violations fixed