Cleaning up deviceId stuff

Basically editorial changes to the description of deviceId.