minor simplifications.