cleanup a bit so we stay <80