refactoring #www
refactoring #www