CONN-1368: Fixed feew other format changes and spelling issues