maybe I should clarify - I do not see much value in cleaning it much more because it will be extracted to the configuration handler anyway and can be improved there, I want to work on the config as soon as this one gets merged ... I could work on improving it in current state if you like - I just see a little value in it as extracting configuration will change it anyway