Cleanup of Avalanche.Service

Just modifications to the service class; nothing real major but it is
there.