tidied up config