minor internal simplification