tidied usb.c up a bit