code refactor -- unify items