Cleaned up ping/pong setup