Re-arranged code for certain order single UART devices.
Clean up inconsistent indenting