more minor simplifications