Tidied up config file