More Clean Up, Added Comments