clean-up usb config, fix some tabs

Change-Id: Ib72e03e11ce2dcb14707e08c8ffdfebadac1aeac