Merge "Minor style fixes" into main