Various code styling error fixes.
Merge pull request #1101 from dannyvankooten/master

Various code styling error fixes.