fixed scope warnings from findbugs