FindBug recommendations implemented