Some slight simplification