Refactor; define points in model