unify space handling