Tidied up configuration