Updated config, cleaned it nicely