Refactoring. I only left the default config file, not the local one.