Simplify setUp logic