Cleaned up penalty box logic.