Cleaned up scenario loading