Refactor; define points in model
rm unnecessary def
Merge branch 'use_model'