Continue to revamp USB protocol

Cleaned up and refactored