Code cleanup; increased baud rate