More update of formatting.