Update WAnalyzerS.java

improvements both coding style-wise and functionality-wise