Tidyed up the config file a little