Adjusted for 16 USB transfers;
Code tidy.