Fixing some line length issues
Merge pull request #2262 from richardmiller/fixing-line-length

Fixing some line length issues