fixing findbugs issues (fixed 20 out of 25)