Adding formatting and generalization changes to the data generation functions.