Tidied up config class