Tidied up the init file