Pedantic cleanup