Remove final Serial.println; replace with DEBUG_SEND()
Fix debug lines
Some refactoring in preparation for extracting state