cleaned up ping stuff