clean up data model calculation typing