Minor refactoring of requirements and settings