Tidied up init process