Minor cleanup and improvements...