A little more cleanup and improvements