cleanup config system

Small changes to improve structure of config system and unified texts.