some tiny simplifications