misc cleanup as i read