slight simplifications