Refactoring for the web too