Removing passing PID, cleaning up syntax