minor adjustments to configuration and refactoring