minor simplifications