framework configuration
minor refactoring