some small simplifications