Refactor make-data