[z2132] Do some Coding Style Cleanups

(based on commit [12200] - 69b9a16)

(based on commit [s1758] - 2da969a)