minor refactoring for Eclipse