Code cleanup (& forgot Usart.h on previous checkin)