style fixes, data model redesigned