stoeffel refactor to make it work with webpack