Fix typos, remove empty lines, simplify code and uniformize style.

Change-Id: Ic2ca7b791f9576c7358ba6adf32b045f1ddbc542
Merge topic 'TyposAndCodeStylePass' into master

222faeb9 Fix typos, remove empty lines, simplify code and uniformize style.