cleanup plus as adding namespace and directing to a config class as per #104