Clean up and improvements.