Cleaned Sitecom400x WPA a bit