more pedantic cleanup