Refactor imports to be minification compatible