Cleaned up the setting of services