Fix ID-nits tool nits
Update based on Gordin's feedback