more cleanup of 4/17 lecture