Made choice of w safer and more optimal
1 file changed