Added UART and additional cleaning