simplify bench preparations a bit