code review

findbugs partial fixes