two viewable and editable data types, cleaned structure a bit