worked on findbugs warnings