Tidied up the service install process