some refactoring
Merge https://github.com/xottabut/InternetProviderWind