Clean up formating and spellng

Response to review comments

Change-Id: I712439b1b122126e528e0ff02172aa2285d9b7aa
Merge topic 'uit-cleanup' into master

87353547 Clean up formating and spellng