Some small simplifications