Small cleanup and improvements.