#8117081636703 #8117081636698 refactor model.js