Tidying up config a little.