fixing findbugs issues (fixed 20 issues)