Slight simplifications