Clean up, added name query param