Refactor/browser build