Code: Analysis and formatting.
Merge pull request #924 from am11/master

Code: Analysis and formatting