Serial.print preplaced with SERIAL_PRINT and cleanup