Cleaned up arena logic