Tidy up config a bit