Cleanup view and add api_key