tiny, tiiiny cleanup of stuff ... and things