Cleaned up the service definition.