Various code styling fixes
Various code style fixes.