Checkout cleanup and improvements.