Cleanup and improvements.