[Core] Code cleaning and fixed a minor issue with the configuration loading