Simplify rehash