some more tidying of initialize Data