Clean up main, launch UDP listener and report port
Fix merge conflict