a little import cleanup
update data model