further cleanup and proper PID identification