Cleaned up config file to make it mean and lean