Change double quotes to single quotes.
Move comments from the end of lines to the line above. Some other miscellaneous code reformatting.
Merge branch 'hotfix/code-style'