- WS, simplify code