minor wording change in collision data model
code cleanup