diff --git a/YSFGateway/YSFHosts.txt b/YSFGateway/YSFHosts.txt
index 866d852..aaa34ea 100644
--- a/YSFGateway/YSFHosts.txt
+++ b/YSFGateway/YSFHosts.txt
@@ -12,108 +12,108 @@
 # https://register.ysfreflector.de/export.php
 #
 
-# YSF032 / Arizona USA      / MARA C4FM     
+# Arizona USA      / MARA C4FM     
 99.196.226.130 42000
 
-# YSF500 / AU FUSION2       / AU Reflector2 
+# AU FUSION2       / AU Reflector2 
 aufusion2.ysfreflector.net 42000
 
-# YSF005 / CA YSF005        / QC Fusion     
+# CA YSF005        / QC Fusion     
 ysf.ve2mrc.com 42000
 
-# YSF002 / CT YSF002 wCAT   / C4FM Catalunya
+# CT YSF002 wCAT   / C4FM Catalunya
 c4fm.ea3hkb.com 42000
 
-# YSF262 / DE Germany       / YSF262 TG26208
+# DE Germany       / YSF262 TG26208
 ysf262.ysfreflector.de 42000
 
-# YSF013 / DE Germany2      / YSF013 no link
+# DE Germany2      / YSF013 no link
 ysf262.ysfreflector.de 42001
 
-# YSF012 / DK-YSF012 C4FM   / DK-YSF012 C4FM
+# DK-YSF012 C4FM   / DK-YSF012 C4FM
 oz2ree.dk 42000
 
-# YSF018 / FON-Gateway      / AllModes-GW   
+# FON-Gateway      / AllModes-GW   
 ysf-fon.f1tzo.com 42000
 
-# YSF010 / FUSION-ITALY     / Italy YSFR    
+# FUSION-ITALY     / Italy YSFR    
 c4fm-it.selfip.com 42000
 
-# YSF003 / FUSIONBE2        / FusionBelgium 
+# FUSIONBE2        / FusionBelgium 
 ysf.on4top.be 42000
 
-# YSF202 / GR YSF202        / Fusion Greece 
+# GR YSF202        / Fusion Greece 
 ysf202.dv4gr.eu 42000
 
-# YSF222 / IT YRF003 CISAR  / www.cisar.it  
+# IT YRF003 CISAR  / www.cisar.it  
 xrf003.iw0red.it 42000
 
-# YSF423 / NETDA            / FusioNET      
+# NETDA            / FusioNET      
 ysf423.netda.us 42000
 
-# YSF860 / NJ EXP           / NJ EXP        
+# NJ EXP           / NJ EXP        
 xrf.njpaasterisk.org 42000
 
-# YSF031 / NL Central       / C4FM NL       
+# NL Central       / C4FM NL       
 c4fm.pa7lim.nl 42000
 
-# YSF444 / NL YSF444        / Dutch Refl.   
+# NL YSF444        / Dutch Refl.   
 ysf444.pa3dfn.nl 42000
 
-# YSF260 / PL POLAND        / DMR 260042    
+# PL POLAND        / DMR 260042    
 ysf260.ham-dmr.pl 42026
 
-# YSF016 / PL YSF016        / SR8UWD Wlodawa
-ysf016.wiresx.pl 42000
-
-# YSF021 / Poland 21        / DMR TG260021  
+# Poland 21        / DMR TG260021  
 ysf021.ham-dmr.pl 42021
 
-# YSF022 / Poland 22        / DMR TG260022  
+# Poland 22        / DMR TG260022  
 ysf022.ham-dmr.pl 42022
 
-# YSF009 / PT YSF009        / C4FM-Portugal 
+# PT YSF009        / C4FM-Portugal 
 c4fm.from-ct.com 42000
 
-# YSF226 / RO YSF226        / C4FM Romania  
+# RO YSF226        / C4FM Romania  
 77.81.108.136 42000
 
-# YSF231 / SK OM0OUE / Slovakia
+# SK OM0OUE / Slovakia
 88.212.32.147 42000
 
-# YSF023 / SP EmCom         / EmCom TG260023
+# SP EmCom         / EmCom TG260023
 ysf023.ham-dmr.pl 42023
 
-# YSF024 / TechTalk24       / Engineers talk
+# TechTalk24       / Engineers talk
 ysf024.ham-dmr.pl 42024
 
-# YSF015 / UK_YFS_BM_UK     / UK_Ref_DN_ONLY
+# UK_YFS_BM_UK     / UK_Ref_DN_ONLY
 bm-dmr.uk 42000
 
-# YSF011 / US Michigan-MI5 / Michigan MI5
+# US Michigan-MI5 / Michigan MI5
 c4fm-mi5.kb8zgl.net 42000
 
-# YSF008 / US YSF008 USA    / DVSwitch Test 
+# US YSF008 USA    / DVSwitch Test 
 ysfreflector.dvswitch.org 42000
 
-# YSF230 / YSF CZ1          / Czech 1       
+# YSF CZ1          / Czech 1       
 80.250.3.114 42000
 
-# YSF014 / YSF-France       / Fusion-France 
+# YSF-France       / Fusion-France 
 m55.evxonline.net 42000
 
-# YSF004 / YSF004-EDT       / C4FM Reflector
+# YSF004-EDT       / C4FM Reflector
 c4fm.sustrai.org 42000
 
-# YSF006 / YSF006 NORWAY    / 24299+XLX404D 
+# YSF006 NORWAY    / 24299+XLX404D 
 ysf.hamlabs.no 42000
 
-# YSF017 / YSF017           / YSFLatino TG-9
+# YSF016           / Wlodawa       
+ysf016.wiresx.pl 42000
+
+# YSF017           / YSFLatino TG-9
 ysf-latino.ddns.net 42000
 
-# YSF906 / YSF906           / ED7ZAK        
+# YSF906           / ED7ZAK        
 xrf906.radioclubveleta.es 42000
 
-# YSF000 / ZZ Parrot / Parrot
+# ZZ Parrot / Parrot
 127.0.0.1 42000