Code cleanup
Add COM port selection