Cleanup load_content a bit