minor refactoring for Eclipse reasons
minor refactoring for Eclipse