Refactor the code, taking advantages of the underscore-fix's update