Come ws refactoring
Some ws refactoring