Cleanup & comments. PingPong event moved to its own class.