simplify the db structure a bit