clean up unify one into less cases