Minor update: DataManager

minor code optimisation