unify structure a little