simplify / cleanup seek code