Refactor data generation app a little.