Facebook code cleanup and improvements.