Pass instrument device ID to instrument params, clean up code style.