Cleaned up activity_puzzle