Code Review

 * Removed Windows line endings (^M).
 * Applied Coding Standards.
Merge pull request #1 from nigelgbanks/7.x-code-review

Code Review