Tidying up config