unify some stuff