small simplifications