stuff web, refactor