Reverted some of the coding style fixes

Strings containing single quotes may be easier to read if enclosed in double quotes although it generates puppet lint warning.